Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Oct 2011 06:45:36 +0000 (23:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Oct 2011 06:45:36 +0000 (23:45 -0700)
commit57b38744212ccdb89ba64ab201ae060d1f45d123
tree3cfc250d52a7e5ffd5a9da58361e4779afb5a326
parent128ed0751c290f8565dacf34b6cc148bb867b837
parentb65975309561dfdc516c14133768f3550617828d
Merge from trunk.